Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 05:09:13 +0000 (21:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 05:09:13 +0000 (21:09 -0800)

Trivial merge